From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 26 May 2016 19:41:38 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~2920
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=fa419c2398349f201cfac89c9754c400b709db29;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

9ca5dbf Avoid shrinking windows with Gtk+ 3.20.3
---

fa419c2398349f201cfac89c9754c400b709db29